diff --git a/application/config/config.php b/application/config/config.php
index 0691620..85d8da0 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -255,14 +255,14 @@
 
 /*
 |--------------------------------------------------------------------------
-| Error Templates Directory Path
+| Error Views Directory Path
 |--------------------------------------------------------------------------
 |
 | Leave this BLANK unless you would like to set something other than the default
 | application/views/errors/ folder.  Use a full server path with trailing slash.
 |
 */
-$config['error_templates_path'] = '';
+$config['error_views_path'] = '';
 
 /*
 |--------------------------------------------------------------------------
diff --git a/system/core/Exceptions.php b/system/core/Exceptions.php
index 398459d..0c247f9 100644
--- a/system/core/Exceptions.php
+++ b/system/core/Exceptions.php
@@ -83,8 +83,8 @@
 
 		$config =& get_config();
 
-		$this->_templates_path = (isset($config['error_templates_path']) && $config['error_templates_path'] !== '')
-			? $config['error_templates_path']
+		$this->_templates_path = (isset($config['error_views_path']) && $config['error_views_path'] !== '')
+			? $config['error_views_path']
 			: VIEWPATH.'errors'.DIRECTORY_SEPARATOR;
 	}
 
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 5cee05b..a466977 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -49,7 +49,7 @@
    -  Updated all classes to be written in PHP 5 style, with visibility declarations and no ``var`` usage for properties.
    -  Moved error templates to *application/views/errors/*.
    -  Added support non-HTML error templates for CLI applications.
-   -  Made error templates path configurable using ``$config['error_templates_path']``.
+   -  Made error templates path configurable using ``$config['error_views_path']``.
    -  Moved the Log class to *application/core/*
    -  Global config files are loaded first, then environment ones. Environment config keys overwrite base ones, allowing to only set the keys we want changed per environment.
    -  Changed detection of ``$view_folder`` so that if it's not found in the current path, it will now also be searched for under the application folder.